From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 5 Jan 2023 20:13:43 +0000 (+0000)
Subject: Merge version 4:22.08.3-3+rpi1 and 4:22.12.0-2 to produce 4:22.12.0-2+rpi1
X-Git-Tag: archive/raspbian/4%22.12.0-2+rpi1~1
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ec844e50a0ab56c482e8d1eb9ad54fe82f1bb7bc;p=marble.git

Merge version 4:22.08.3-3+rpi1 and 4:22.12.0-2 to produce 4:22.12.0-2+rpi1
---

ec844e50a0ab56c482e8d1eb9ad54fe82f1bb7bc
diff --cc debian/changelog
index 9c51eca,ce971b7..a473e74
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,35 +1,42 @@@
- marble (4:22.08.3-3+rpi1) bookworm-staging; urgency=medium
++marble (4:22.12.0-2+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 4:22.08.3-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 08 Dec 2022 15:44:12 +0000]
 +  * Remove armhf from qtwebengine architecture list.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 08 Dec 2022 15:44:12 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 05 Jan 2023 20:13:43 +0000
++
+ marble (4:22.12.0-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Add the qtwebengine5-dev dependency in libmarble-dev on architectures where
+     QtWebEngine is used, as the CMake config files of Marble require
+     QtWebEngine in that case (Closes: #1026814)
+     - drop qtwebengine5-dev from the dependencies of the 'acc' autopkgtest,
+       now it is properly installed
+   * Remove an obsolete maintscript entry.
+   * Update standards version to 4.6.2, no changes needed.
+   * Remove inactive Uploaders.
+   * Drop unused debian/marble-data.qml-ignore file.
+ 
+  -- Pino Toscano <pino@debian.org>  Thu, 22 Dec 2022 10:23:12 +0100
+ 
+ marble (4:22.12.0-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Source-only upload
+ 
+  -- Matthias Geiger <matthias.geiger1024@tutanota.de>  Fri, 16 Dec 2022 17:06:14 +0100
+ 
+ marble (4:22.08.3-4) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Sandro Knauß ]
+   * Only depend on QtWebEngine for the archs with QtWebEngine for autopkgtests.
+   * Update symbols from buildds for 4:22.08.3.
+   * Update QML runtime deps for marble-maps and plasma-marble (Closes: #806189)
+ 
+  -- Sandro Knauß <hefee@debian.org>  Sat, 10 Dec 2022 14:22:35 +0100
  
  marble (4:22.08.3-3) unstable; urgency=medium
  
diff --cc debian/control
index f53e8e1,0e24aec..7ac429d
--- a/debian/control
+++ b/debian/control
@@@ -39,10 -38,10 +38,10 @@@ Build-Depends: cmake (>= 3.16~)
                 qtpositioning5-dev (>= 5.14.0~),
                 qtquickcontrols2-5-dev (>= 5.14.0~),
                 qttools5-dev (>= 5.14.0~),
 -               qtwebengine5-dev (>= 5.14.0~) [amd64 arm64 armhf i386 mips64el mipsel],
 +               qtwebengine5-dev (>= 5.14.0~) [amd64 arm64 i386 mips64el mipsel],
                 shared-mime-info,
                 zlib1g-dev,
- Standards-Version: 4.6.1
+ Standards-Version: 4.6.2
  Rules-Requires-Root: no
  Homepage: https://marble.kde.org/
  Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/marble